Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 23 Feb 2010 21:58:05 +0000 (21:58 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 23 Feb 2010 21:58:05 +0000 (21:58 +0000)

Trivial merge